Merge changes I6c489eb4,I552b40c0
am: 75c88ab266

Change-Id: I60ba4aa8b0a58c6e6463ce86c72a7e8ad68f4e15