Merge changes Id7954667,I22de38dc
am: b1e7530af2

Change-Id: I3812e62448d4851afcea7d35842c27dd28b00b0c