Merge changes I399d3e37,Ia3fdd80c,Iad90c7a4
am: 870c267b6c

Change-Id: I1df4d64ef2c56a1f8f7fb6b5dfd6de1eab2e157b