Merge changes I31e444f3,If07ff05f,If3ba190d
am: cb140c04c9

Change-Id: I1fd605920a444413498322ba6810aa5b6a018a20