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

Change-Id: Ie69d8ee030d4b98a5b13dfd85a7ea6945270d49f