Merge "Avoid copying profile" am: c2159fd5b6
am: ab70e664c3

Change-Id: I117b8f0448bbcca8537378ec024540d37376dd31