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

Change-Id: I36012b370e70573782e0c1fba5f8a489e40e0da9