Merge changes I12373148,I1fdc797a,I63d6bbed am: 6732ecbc9f

Change-Id: Ie3dd706451a6c4bc59450e421a501cd0f5773aab