Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp * commit '17efcde161cbcbc0d98bf809036c5e640497f001': DO NOT MERGE Fix bug 3124899 - timeout in CTS test
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp * commit '17efcde161cbcbc0d98bf809036c5e640497f001': DO NOT MERGE Fix bug 3124899 - timeout in CTS test