Merge changes Iee2d74a3,Ib2298818
am: 1d0c5b63ce

Change-Id: I0b4958079cb6150c0a05e24f916ca50198b67c27