Merge changes I5e341af6,I4356d04c,I849352d8
am: 64679377a2

Change-Id: Ideee373276b5410373008b29412dd530f274a428