resolve merge conflicts of 019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358