Merge changes Ie4ea31b8,I87ff245c
am: 1fce6e83f1

Change-Id: I88b5e6bebe0b3b0095a187c0c70181cee6ccb55d