Merge changes I6c489eb4,I552b40c0 am: 75c88ab266
am: 174976cf78

Change-Id: Ie2fdb6db6cfd75929329f92b5fafdd8fd6462531