am: bb687ad6 * commit 'bb687ad6': Settings test fixes Change-Id: Ib5cd416150227785922566a8b17949f5ff854911