Merge changes from topic "apex_remount"
am: baea773324

Change-Id: If64a41f61f434b49847c954cc56530703d697b73