DO NOT MERGE Fix build am: dfedca4e -s ours am: 499871eb am: 3ea1f124 am: ed3e26e2 -s ours am: e9a9e2f0 am: 351aa0b3 Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc