Merge changes I0baf582f,I4bba01ba
am: e5ee6b9b31

Change-Id: Ie69a03e6c61e172ba7e9948706fe6780be61a41b