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

Change-Id: I861d1a7a4aa980ae351c4b446daf3baa81f59122