Merge changes I59b6e04f,I55694d89 am: 9009eabbfe am: 93134fea64
am: 597757b8ab

Change-Id: I61f321ebd67432e02b5621fa1c662953295999fd