Merge changes I39e84219,I8d0e12cb
am: cae221acac

Change-Id: I5fe14b5b25a1b22e184aa02e658c81d9d0238541