Merge changes from topic "apex_remount" am: ea2d0f8372 am: f1c45f777a am: 7a5c33bcfa
am: 1fb0b8689c

Change-Id: Ia14ea79b8911b5ec548af74ed3dfd12bd95f6855