Merge "ART: More waiting in 063"
am: 92300aefb1

Change-Id: I808d63d22573573c7fc7ab61858b6a68454d042e