[automerger skipped] DO NOT MERGE: Resolve mBehindAlpha with mCurrentBehindAlpha am: 12c8c244a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1290e273b279ac3b57d487b32d1bb695b9f3532