This was previously committed, but I guess it got lost in the merge queue. Bug: 15193147 Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869
dbab409c