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

Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a