resolve merge conflicts of a4398c1 to stage-aosp-master

Change-Id: I550d5716bd5879f779d11509366090bf508731e4