Merge changes If992b53b,Ieab60fd1 am: 7c50033e9f
am: 11b2dbca15

Change-Id: Ibcb4a582ccdf4342b30ab6582a4b5f397b38a7a7