Bug 562658 - [15] Keep merging from master to BETA branch

Change-Id: I97238a15ac7435fbd082d38e641dcca21e0749d0
2 files changed