Merge changes I86d2f5b7,Iea81035e am: 2ebf13586c
am: 8a216ee566

Change-Id: I056f58f42296610c120b8062a840511daf814d04