[automerger skipped] Merge "[Settings] Modified the return value." am:...
[automerger skipped] Merge "[Settings] Modified the return value." am: a25060af am: b66f43a6 am: 5ac5b5ac -s ours
am skip reason: Change-Id I36204b4814a1fe92d5de69054b850da330c04a87 with SHA-1 4108c7fd is in history
Change-Id: I816766d0b7176f83b79a34c70f3689f4699b4b61