Merge changes I8b8df509,I856f01f0 am: 5fcfe7cc4f

Change-Id: I04d08ae82530481d6ea49120107772d37fdc1627