Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2
am: f7fc407e3e

Change-Id: I8941f7ba1cd29db6d3466e5cb340862c43a234c1