Merge changes I304a5d9d,Ied19d9ec,Ie6c03aee
am: 9f518064de

Change-Id: Id45ea1662cbc1b3b7c367cd17017b42b9ed8a856