4bda43777c
Bug 12991308 Cherry-pick from master. Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
Bug 12991308 Cherry-pick from master. Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c