Merge \"cp preopted files from B partition during PM init.\" into nyc-mr1-dev
am: 7281cf276a

Change-Id: I29c2aaa637f5c0f948dae0f6ea065d2136b57e74