DO NOT MERGE Fix build am: dfedca4e43  -s ours am: 499871ebe9 am: 3ea1f124f9 am: ed3e26e2be  -s ours am: e9a9e2f055
am: 351aa0b320

Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc