Merge changes If7b13672,I96135a8c am: 484acce026
am: 4f152a5f50

Change-Id: I19040cce88d99b55ce2b580caa0086d740aa6a9c