Merge changes I0d0c0fac,Ifb9b00b6 am: c3a209382c
am: bfaf963337

Change-Id: Ie943428132fbcfcc565d54b46830ed297227ef35