Merge changes I1c50546e,I8254cb6b,Ib179299a,Iec1c2801
am: 2374693556

Change-Id: I8f1ee8a77732ff26211d89a06b9ddc973ae1f251