Merge changes I9de0ffe9,Idc804896 am: 153fb1c6e0
am: 99161bc1c7

Change-Id: Id831c5ab771fa59ac9906d473ffeb7720fbbdf54