Merge changes I6883ce15,Ife5e6bad,If5a40a97,I36916560
am: 52a161148b

Change-Id: I2818c2536ef3d7e69220e829af4b02f2984ed229