Bug 569149 - [16] Keep merging from master to BETA branch Change-Id: I56028be57e7ba7f3c69aff2bcb7dbf40b2a1b817