Merge changes I1fbd76c9,I94bceacc am: 845050dfb7
am: 01e40be0a4

Change-Id: I2000e85fd3b6c1814bd2f93f67d6418cff62af3a