Merge changes I3375fe14,Ib11ca441,I540c9e3d,I42c12f3f
am: 8520ae1dfd

Change-Id: If5879b8ce4107ab582f05aa5351876527b7f2210