Merge changes I55d0e1a8,I4d9a8776 am: 370aac75ea
am: 4245294d82

Change-Id: I260e8780fc02fe7b302d58350d6eabf8d4578c36