Merge changes I5c6bf2a5,I20a337bb
am: 7f81b2af61

Change-Id: I5388b048cdcc41d374b1d58476def364409b72b2