Update to upstream revision 727 am: 43b88be554
am: 7430b550d7

Change-Id: I2000e97b5f890f1ca194b44ec91b2c0c5717bd0e