Merge changes I0dc38288,I48b713cd
am: 6fb63cbac7

Change-Id: Idd509699da1ca6c5f9c42cda4ddd5cff7de07ade