[automerger skipped] Merge changes Ie18bce98,I1c600bc2 am: 778250f57f -s ours
am: 2a051239f9 -s ours
am skip reason: change_id Ie18bce987b512211d3e91bd1f7334afe11d83cf8 with SHA1 07749b72c6 is in history

Change-Id: I9af92a9410bfee55e238631e1e27245e5bbab129