Merge changes I7d394c66,I737d66e8 am: bc8433d582
am: c8ac6dca3b

Change-Id: I3a00f9f2467155522929b55baa3b6e6ce78e787b