Merge changes I6ff2d6f8,I8f60f116
am: 6b8b075211

Change-Id: Iec665a5733bb2da0a926317e732382f7993489f9