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

Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e