Merge changes I1042e87f,I58b17ecf
am: 5d3357b6f1

Change-Id: Ia97faae586e9c0e945bf51aa0767f840419fbf7c