Merge changes I345f9bf5,I20f23f7f,I22720864,Ic43df22a,I3b1a630b, ... am: 5b44f1f433
am: 704bb165b1

Change-Id: I968d89a89e93654d8384799e33a8e85cbb74dfd3