Merge changes I7c418811,I0870eae0 am: 88fb149b8e
am: df6cb83d97

Change-Id: Idd3080ebe3a6ce42cc0d2eb095b043ecac24fdb9