resolved conflicts for merge of 158e11d6 to mnc-dev-plus-aosp

Change-Id: I164cdc4915b6ca1b623b206c0ccbb12e0fc3fa77