Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b am: 80ce34d6cb am: dfd0492354
am: bd40570e25

Change-Id: I8cf81bab9521b3d0a589943a0a5dbd815aa75b5c