Merge changes from topic "apex_remount" am: baea773324 am: 5b7f4d9cd5 am: 80c7293c89
am: 1fb0b8689c

Change-Id: Ia14ea79b8911b5ec548af74ed3dfd12bd95f6855