Merge changes I1fbd76c9,I94bceacc
am: 845050dfb7

Change-Id: Ib5891c239122baf373f4c473cc729e4fafe05611