Merge changes I12322a48,Ia1d062a1
am: 73206e59d5

Change-Id: I085fe306d04935d9f345531ef68879fdc48ec22e