Merge "Fix waiting for system server to be running for BootImageProfileTest"...
Merge "Fix waiting for system server to be running for BootImageProfileTest" am: 761ce2ab am: ca31663a am: 32a897e4
am: b2b97f62
Change-Id: If6fcfe7bb0afa2852de98a684c4d96a0c901849b