resolved conflicts for merge of b856e3fc to jb-dev-plus-aosp

Change-Id: I4ba117e8af6f3ffa5f17e21d63d4fb434bc19cc5