Merge changes Ied6a13be,Ia4818f62,I660a4384 am: c7483ff8bf am: fca0df0215

Change-Id: I190062aae1e366f3e522ee01b5e6027a375074fd