Merge changes I16e45b38,I150ade94 am: f887894039
am: f72b896afb

Change-Id: I765a7ba2a07db6587d0b2439e275131917eb5e2a