After error during file transfer... Change-Id: I21da694f81a4290e9af1f7647a8ceb6c6d3d806b
(Updated test app to confirm the fix.) Change-Id: Ife56cf07f282786162e2ebc5aaddbb24dac6cafd