Merge changes I9b41e78f,Ia66e5da5 am: e416f70786
am: 1a7e9950a4

Change-Id: Iff2dc8ec7c6a7af8dcfe3854044da3dc74b6cf26