Merge "Fix profile dependency" am: 4d42fef1db
am: 52e0317804

Change-Id: I6a51e3fc7b1f0c1a0187304be04f21bc1d1355fc