Merge changes I06179fca,Ie48746c8,Ia47ebc95
am: b182ea7bcb

Change-Id: Iab7d8000f1f7bb1b8d5b63c4a4a1720b35558725