Merge changes Ib5dc7f29,I5b64d435
am: 857135005b

Change-Id: I909af1142a9f7a700ff3ee83b8cbd11776d393bc