Merge to upstream r355142. am: cc3148bd34 am: 4041d10e89
am: 577cbc963f

Change-Id: I68b7d36102e9fbcd810e00fac4490f29619f41d7