resolve merge conflicts of 54c1219 to stage-aosp-master

Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec