Merge changes I7d394c66,I737d66e8
am: bc8433d582

Change-Id: I40a4e7f44dad478a7796a4f591d46369ad95b6be