resolved conflicts for 7de7e0b0 to stage-aosp-master

(cherry picked from commit 9f8602644418ecfb1a5c9555792ceed285fa72bd)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
5 files changed